Repository navigation
Conversation
… gem as in our case
|
I've cherry-picked a couple of these suggestions, thank you. Do you have strong views on line wrapping in the markdown files? I deliberately used hard line wrapping with pandoc to avoid overly long lines in the markdown where possible. Are you comfortable with rebasing and force-pushing to a branch to update a pull request on GitHib? |
|
@peterjc - no strong views on line wrapping. I didn't realize it was intentional - they just wrapped odd as I was resizing my screen while working so I removed them. No worries at all on it. I haven't done rebasing and force-pushing to a branch .. if you can teach me how or point me to something that does I'd be more than happy to. thanks! |
|
Good idea, I opened #84 on updating http://biopython.org/wiki/GitUsage |
|
Basic idea for re-basing and updating this pull request: $ git fetch origin
$ git checkout issue-79
$ git rebase origin/master
...Bad case, you need to merge stuff. Here the abort option would be: $ git rebase --abortThen you should be back to where things were. Good case, it just works (and this is what I would expect as I only cherry-picked a few of your changes so git should spot this and cope smoothly). In which case, assuming you named your fork https://github.com/mgudapak/biopython.github.io as $ git push mgudapack issue-79 --forceThis is about the only time you should ever do a force-push! This will update the branch |
Summary of changes
P.S. - Sorry about clubbing fixes for two issues together in one pull request but they are closely related.